Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare JEP331 with an empty implementation #4461

Merged
merged 1 commit into from
Feb 22, 2019
Merged

Prepare JEP331 with an empty implementation #4461

merged 1 commit into from
Feb 22, 2019

Conversation

JasonFengJ9
Copy link
Member

@JasonFengJ9 JasonFengJ9 commented Jan 25, 2019 •
edited by pshipton
Loading

Prepare JEP331 with an empty implementation

This is a subset of #3754 without GC related functionalities.
Updated jvmti.h with JVMTI 11 version, new event and method defines, changed JVMTI_VERSION_9_0 to JVMTI_VERSION_9 to match RI (this addresses the issue reported at https://openj9.slack.com/archives/C8312LCV9/p1548360917133500);
Added a sanity test;
Removed unused J9JVMTIEnv.capabilitiesMask and related code.
Note: this might have an impact on #2368

closes #4667

Peer reviewer: @tajila
Reviewer: @DanHeidinga

Signed-off-by: Jason Feng [email protected]

@JasonFengJ9
Copy link
Member Author 

16:05:57 The following files were modified and have incorrect copyrights
[Pipeline] echo
16:05:57 runtime/oti/j9vm.hdf
16:05:57 	IBM Copyright date appears to be incorrect
[Pipeline] echo
16:05:57 runtime/oti/jvmtiInternal.h
16:05:57 	IBM Copyright date appears to be incorrect

I had the date updated accordingly.

//Copyright (c) 2006, 2019 IBM Corp. and others

 * Copyright (c) 1991, 2019 IBM Corp. and others

@AdamBrousseau any insights?

@JasonFengJ9
Copy link
Member Author

Aha, looked at wrong file for j9vm.hdf.

@JasonFengJ9
Copy link
Member Author

Never mind, @AdamBrousseau, find the problem.

@JasonFengJ9 JasonFengJ9 mentioned this pull request Feb 8, 2019
Closed
@DanHeidinga DanHeidinga requested a review from gacholio February 20, 2019 18:33
@DanHeidinga
Copy link
Member

@gacholio Can you review this? The goal is to get the required jdk11 constants into jvmti.h. The implementation of the new capabilities to follow in future PRs

gacholio
gacholio requested changes Feb 20, 2019
View reviewed changes
runtime/jvmti/j9jvmti.tdf Outdated Show resolved Hide resolved
@gacholio
Copy link
Contributor

Please resolve the merge conflicts and remove "event" from the test names/directories.

@gacholio
Copy link
Contributor

jenkins test sanity xlinux jdk11

@JasonFengJ9
Prepare JEP331 with an empty implementation
428c7fc 
Updated jvmti.h with JVMTI 11 version, new event and method defines;
Added a sanity test;
Changed JVMTI_VERSION_9_0 to JVMTI_VERSION_9 to match RI;
Removed unused J9JVMTIEnv.capabilitiesMask and related code.

Signed-off-by: Jason Feng <[email protected]>
@JasonFengJ9
Copy link
Member Author

Fixed JDK11 Sanity gpc001 failure and manually verified it passes with PR updates.
The change is at tests/jvmtitests/src/com/ibm/jvmti/tests/getPotentialCapabilities/gpc001.c.

@gacholio please have another look.

@gacholio
Copy link
Contributor

jenkins test sanity xlinux jdk11

@pshipton pshipton added this to the Release 0.13.0 (Java 12) milestone Feb 22, 2019
@gacholio gacholio merged commit 56ba11d into eclipse-openj9:master Feb 22, 2019
This was referenced May 31, 2019
Merged
Closed
@JasonFengJ9 JasonFengJ9 deleted the jvmti11 branch June 3, 2019 15:08
This was referenced Jun 4, 2019
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gacholio gacholio gacholio approved these changes

Assignees
No one assigned
Labels
comp:vm
Projects
None yet
Milestone
Release 0.13.0 (Java 12)
Development

Successfully merging this pull request may close these issues.

Support for JVMTI 11.0 spec version
4 participants
@JasonFengJ9 @DanHeidinga @gacholio @pshipton